]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
st/scroll-view: Use ClutterEvent getter methods
authorCarlos Garnacho <carlosg@gnome.org>
Fri, 4 Aug 2023 12:23:38 +0000 (14:23 +0200)
committerMarge Bot <marge-bot@gnome.org>
Sat, 5 Aug 2023 19:07:41 +0000 (19:07 +0000)
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2860>

src/st/st-scroll-view.c

index 50de481944c5f0110143ded33078923c006c272f..9f667e5459a3c35b86dee2e2b51931d5e974f053 100644 (file)
@@ -764,6 +764,7 @@ st_scroll_view_scroll_event (ClutterActor       *self,
 {
   StScrollViewPrivate *priv = ST_SCROLL_VIEW (self)->priv;
   ClutterTextDirection direction;
+  ClutterScrollDirection scroll_direction;
 
   /* don't handle scroll events if requested not to */
   if (!priv->mouse_scroll)
@@ -773,8 +774,9 @@ st_scroll_view_scroll_event (ClutterActor       *self,
     return TRUE;
 
   direction = clutter_actor_get_text_direction (self);
+  scroll_direction = clutter_event_get_scroll_direction ((ClutterEvent *) event);
 
-  switch (event->direction)
+  switch (scroll_direction)
     {
     case CLUTTER_SCROLL_SMOOTH:
       {
@@ -790,7 +792,7 @@ st_scroll_view_scroll_event (ClutterActor       *self,
       break;
     case CLUTTER_SCROLL_UP:
     case CLUTTER_SCROLL_DOWN:
-      adjust_with_direction (priv->vadjustment, event->direction);
+      adjust_with_direction (priv->vadjustment, direction);
       break;
     case CLUTTER_SCROLL_LEFT:
     case CLUTTER_SCROLL_RIGHT:
@@ -798,13 +800,13 @@ st_scroll_view_scroll_event (ClutterActor       *self,
         {
           ClutterScrollDirection dir;
 
-          dir = event->direction == CLUTTER_SCROLL_LEFT ? CLUTTER_SCROLL_RIGHT
+          dir = scroll_direction == CLUTTER_SCROLL_LEFT ? CLUTTER_SCROLL_RIGHT
                                                         : CLUTTER_SCROLL_LEFT;
           adjust_with_direction (priv->hadjustment, dir);
         }
       else
         {
-          adjust_with_direction (priv->hadjustment, event->direction);
+          adjust_with_direction (priv->hadjustment, direction);
         }
       break;
     default: